merge trunk

diff --cc src/ChangeLog
index 6a0b8dbb3d5358e0b11ec97b0ba88fb5863dfe61,3711d86b0bba21411535e50699235a98e2a9e01c..f2500573f36305af40dddf6f0877226bc6ac1b59
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,10 -1,14 +1,19 @@@
 +2012-09-30  Kenichi Handa  <handa@gnu.org>
 +
 +      * coding.c (decode_coding_ccl, encode_coding_ccl): Pay attention
 +      to the buffer relocation which may be caused by ccl_driver.
 +
  2012-09-30  Jan Djärv  <jan.h.d@swipnet.se>
  
+       * xfns.c (Fx_file_dialog): Update comment.
+ 
+       * w32fns.c (Fx_file_dialog): Update comment.
+ 
+       * nsfns.m (Fns_read_file_name): Add argument DIR_ONLY_P.
+       Initialize panel name field if OSX >= 10.6.
+ 
+       * fileio.c (Fnext_read_file_uses_dialog_p): Add HAVE_NS.
+ 
        * nsfns.m (ns_frame_parm_handlers): Add x_set_fullscreen.
  
        * nsterm.m (NEW_STYLE_FS): New define.